Merge pull request #5 from xwm1992/master