Updated with comments and fixes
Merge branch 'master' of https://github.com/opencimi/AML