fix
Merge branch 'master' of github.com:amatig/amati_test