Commit before refactoring and creating a new branch
Merge pull request #18 from mass6/V1.2

Commit before refactoring and creating a new branch