add fw 500
Merge branch 'master' into gh-pages