changes for sandcamp
Merge branch 'sandcamp' into gh-pages