Merge pull request #205 from assem-ch/master

many fixes, fix #204
Merge branch 'master' of github.com:Alfanous-team/alfanous