0.2.5, fixing components for testing
Merge branch 'hotfix/0.2.5'