Refactoring
Bump version
Merge pull request #2 from llh1/development

Refactoring