Revert "Fix the branch conflict"
Merge pull request #13 from passdan/revert-12-master

Revert "Fix the branch conflict"