Merge pull request #1 from crain/develop

Refactoring