Moved creation of state to State constructor
Merge pull request #107 from bvssvni/expression

Moved creation of state to State constructor