Merge pull request #10 from glodos/master

Update to latest version
Merge pull request #186 from McGiverGim/master

Merge pull request #10 from glodos/master