Merge pull request #10 from glodos/master

Update to latest version