Merge branch 'feature/decode' into develop
Allows no 'self' link
Merge branch 'release/0.9.0'