Merge pull request #3 from markdessain/master

merge