bringing change made in gh-pages into master branch

probably should do this as a merge ... didn't remember the code layout
though