Merge pull request #53 from stulees/master

Refactoring to begin separation of code