Merge pull request #60 from eile/master

Improvements based on @tribal-tec review
Merge branch 'master' of https://github.com/Eyescale/Lunchbox
Fix assertions from last commit