Removed some lines to give more space to code
Merge branch 'master' into gh-pages