Merge pull request #4 from github-jay/master

1