unicorn support
Merge branch 'master' of https://github.com/baya/SceneMaster