Fixes

+ Fixed #1
+ Fixed #103