Merge branch 'pr/80' into dev