Merge pull request #7 from cmonyoupick/master