Rewrite to behave better
Merge pull request #157 from banggugyangu/master

Rewrite to behave better