Merge pull request #565 from NicoleRauch/master

Cleanup