Merge pull request #12 from github-jay/master

123