General clean-up.  Improve handling of retrieving data
Merge branch 'master' into gh-pages

* master:
  General clean-up.  Improve handling of retrieving data