Bug fixes

+ Fixed #73
+ Fixed #70