Fixes #79 & #19
Merge pull request #86 from dogox22/nfixes

Fixes #79 & #19