Merge pull request #1 from singachea/master

sfsf