Merging with changes from master#1

dsilvian wants to merge 3 commits into

risecourse:masterrisecourse/PyMUS:masterfrom

dsilvian:masterdsilvian/GroupI:masterCopy head branch name to clipboard