Merge pull request #7 from futurity-pro/master

v 2.0.0
refactoring
Merge remote-tracking branch 'origin/dev' into dev