refactoring
Merge pull request #29 from mikeplavsky/master

Refactoring