Merge pull request #1 from franky1205/master

shawn pull