Fixing #51 and bumping to 1.0.1