OCD panic fixes..
Merge branch 'master' of https://github.com/irony/wejay-maestroo