Merge pull request #92 from eile/master

Fix build against latest Lunchbox
Merge pull request #93 from eile/master

CR Eyescale/Lunchbox#85