Merge branch 'master' of https://github.com/Eyescale/Lunchbox
Improvements based on Carlos O. review
Merge branch 'master' of https://github.com/Eyescale/Lunchbox
Fix assertions from last commit
Merge pull request #61 from eile/master

Improvements based on Carlos O. review