Merge pull request #1 from DanielTing/master