Merge pull request #98 from eile/master

Changes needed after Eyescale/Lunchbox#91
Minor cleanup