Issue #7, Issue #11
Merge branch 'master' into gh-pages