Merge pull request #1 from jimmykuu/master