Merge pull request #81 from polynickglot/master

Refactor