Swap base class order
Fix incorrect test
Add an exception when an instance is mapped twice
Merge pull request #35 from jacebrowning/feature/fix-mro

Fix method resolution order for modified classes