Fixed #10, solved #9, bumped version to 0.1.5