merge local
Merge branch 'master' of git@github.com:masimun/AMFBach.git
small changes