Merge pull request #47 from wtangiit/master

fix merge issue