Merge pull request #8 from github-jay/master

1