Recreating fix for #15 in master

Accidentally checked the other one into 0.2