Fixed bug cause by indention mistakes :(
Merge branch 'master' into gh-pages