Merge branch 'issue-23' into 'issue-27'

Issue 23: define states for automation level

See merge request !22