Fixes and small additions
Merge branch 'master' of https://github.com/draget/SAEAuto