closed #9
t Merge branch 'master' into gh-pages