Merge pull request #5 from dotted/master

refactor