Fix a few things
Merge branch 'master' of https://github.com/fahslaj/maestro_2014