Merge branch 'release/0.5.3' into develop
Use selectors
Update version
Merge branch 'release/0.5.4'