Merge pull request #44 from eile/master

Build fixes
Merge branch 'master' of https://github.com/Eyescale/Collage