Cleanup
Merge pull request #19 from pmorie/custompod-wip

Cleanup