Merge pull request #19 from syhc/master

Refactoring
Merge pull request #6 from mikegiberson/master

Merge pull request #19 from syhc/master