Update to latest version
Merge pull request #31 from ardumont/master

Update to latest version