Fixes #108 - full of win!