Add notes on problems and possible workarounds
Merge branch 'master' into gh-pages