Merge pull request #335 from jeffwilcox/dev

Refactoring repository