Merge pull request #7 from jechols/develop

Minor configurator and test updates