Some fixes
Merge branch 'master' of https://github.com/nikivat/Aladdin
Merge branch 'master' of https://github.com/nikivat/Aladdin
Merge branch 'master' of https://github.com/nikivat/Aladdin
docs folder
Fixed bugs