Merge pull request #9 from nathan7/fix-delegation

Fix delegation