Improve shipping repository and fix template inheritance
Merge pull request #12 from tangentlabs/fix_shipping_repository

Fix #11, Improve shipping repository and fix template inheritance