Merge pull request #732 from NicoleRauch/master

Small cleanup