Merge pull request #115 from OwenMcGirr/develop

major refactoring