Added state field
0.4.7
Merge branch 'master' into code-refactor

* master:
  0.4.7
  Added state field