fixed nonsense
Merge branch 'develop' into gsouthey
added responsibilities