Merge branch 'issue-2' into 'develop-v2.1.1'

Updated according to the new actsUpon/observes/control properties

Closes #2

See merge request !6