Merge pull request #41 from netputer/master

Bugfix