leuft und bug fixe
Merge branch 'mamut' of github.com:braindump/ams into mamut