still testing
Trimming and commenting
Merge branch 'master' into gh-pages