Added more tests.
Refactoring. Cleanup.
Merge branch 'master' into feature
Implemented state unknown and support for comments.