Fixes

+ Fixed #43
+ Fixed #54