Fix for #26 & #28
Merge pull request #31 from dogox22/master

Fix for #26 & #28