fixed refactor
Merge branch 'master' into refactor
Merge pull request #15 from nullet/refactor

Refactor