Fixed missing property
Fixed usaging of the new property.
Added state property.
Merge branch 'FAKE-ISSUE-#1'