Merge pull request #10 from Wundero/master

Random little fixes
Merge pull request #1 from Puharesource/master

Merge pull request #10 from Wundero/master