Merge pull request #1 from reillysiemens/refactor

Refactor