Bug fixes

+ Fixed #64
+ Fixed #61
+ Fixed #60