Merge pull request #2 from hubnate/master

Update