Merge branch 'alpha' of tomsrv:tomamp into alpha