Keep working in Python2
Keep states in order

This is the minumum required to support a derived
ordered state machine implementation
Merge pull request #2 from nzjrs/master

Keep states in order