merging dev work from gh-pages branch