Merge pull request #1 from RossMerriam/develop

Develop
changed requirements functionality to a simplier system.
merged from origin
changed to customized settings.
fixed merge