Merge pull request #243 from nhr/master

Less over-engineered @register_components test