Merge pull request #2 from mteece/dev

0.0.3 Development