parallax bugfix and doc changes
parallax docs
Merge branch 'master' into gh-pages