infinite fire bug fixed with state application
Merge branch 'master' into gh-pages