Cleanup
Merge pull request #1 from jstormes/develop

Cleanup