Fix chain breaking change and add chain magic
Merge pull request #73 from jrschumacher/fix-chain-issue

Fix chain breaking change and add chain magic