Merge branch 'release/0.5.0'
Merge tag '0.5.0' into develop

Tagged for 0.5.0