Minor fixes
Fixed #11
Fixed #10