Reverting to 50c2130
Merge pull request #50 from shannonturner/development

Reverting to 50c2130