Merge pull request #9 from askeing/master

Refactoring.