Make the code a bit more beautiful (Unnecessary Commit)
Merge branch 'master' into gh-pages