Merge branch 'release/0.5.4' into develop
bugfix in component handling
bumped version
Merge branch 'release/0.5.5'