First dev commit
Merge pull request #2 from mikezoller/development

First dev commit