Merge branch 'hotfix/0.2.4'
0.2.5, fixing components for testing
fix for test rig