Merge pull request #19 from brentthorne/dev

Merge pull request #18 from brentthorne/master