implemented a few changes suggested by stacy
Merge branch 'gh-pages'

* gh-pages:
  implemented a few changes suggested by stacy