Merge pull request #58 from longility/master

Refactor