troydm Merge pull request #8 from codcodog/master …