Add custom format support
Merge pull request #70 from scudco/custom-formats

Add custom format support