Merge pull request #3 from timpx/master

Update