Cleanup
Merge pull request #242 from DavidRagazzi/cleanup

Cleanup