Merge pull request #2 from hubnate/master

Update
Merge pull request #3 from hubnate/developing

Merge pull request #2 from hubnate/master