Bug fixes

+ Fixed #67
+ Fixed #66
+ Fixed #65
+ Fixed #63