Merge pull request #3 from meancoot/master