refactor
Merge branch 'master' into refactor-object-oriented
Merge pull request #1 from haazime/refactor-object-oriented

Refactor object oriented