Merge pull request #3 from joerchan/master