Merge pull request #3 from BabkaFox/master

Refactor