Merge pull request #14 from serathius/master

Refactor
Refactor.