Merge pull request #1 from bwood/master

Initial feature: