Fixed #34
Fixed #35
Version updated to 0.4.7