minor refactoring.
Release 0.5.0.
Merge branch 'release/0.5.0'
Merge tag '0.5.0' into develop

0.5.0
Starting 0.6.0