fix merge mistake
Merge pull request #5 from cbx/master

Thank you.