Merge pull request #1 from anhsaker/master

Shorten return, delete some blank line...
Merge branch 'upstream/master'