Added support for allowing inheritance merging
Merge pull request #2 from gvilarino/allow-inheritance

Add support to inheritance merge