Merge pull request #1 from dannydes/master

Change <title>
Merge branch 'master' into gh-pages
Comments and code arrangement