Fix code style
Merge from source master
Merge pull request #5 from daydayfree/master

Fix code style