Empty initial state bug fix
Merge branch 'master' into gh-pages