Update to latest
Merge pull request #1 from jedmao/master

Update to latest