Merge branch 'dev' into 'master'

Grammar and other refinements, fix for missing dependency

See merge request !11