fixed blue screen with branching
Merge branch 'master' into gh-pages