Merge pull request #11 from wmbenedetto/develop

Bumped package and component versions to 0.3.1
Merge pull request #12 from wmbenedetto/develop

Develop
Refactored to reduce file size