Fixed previous merge issues
Merge branch 'master' of github.com:dridon/aml4