Merge pull request #3 from dotdoom/master-features

Do not dive too deep into the type structure