fixed blue flash error. done!
Merge branch 'andrew' into gh-pages