Merge branch 'release/0.5.1' into develop
use method to resolve dependency id
various bugfixes
bumped version
Merge branch 'release/0.5.2'