Merge pull request #1 from wiyow/master

Just want to have the latest version of your code