Fixes

+ Fixed #95
+ Fixed #94
+ Fixed #92