Merge pull request #29 from 30x/refactor

Refactor