Minor changes to play nicely with Waxe
Merge remote-tracking branch 'origin/master'
Merge pull request #8 from larsiusprime/master

Plays nicely with Waxe