refactor
Merge pull request #94 from Pathologic/master

refactor