Simple fix and associated test for #215
Merge branch 'master' into fix-data-get_component-None
Merge pull request #216 from JudoWill/fix-data-get_component-None

Fix for #215