Merge pull request #2 from jedmao/master

Update to latest
Update to latest