Merge tag '0.3.0' into develop

Released-0.3.0 0.3.0
removed merge conflict indicator
bumped version
Merge branch 'release/0.3.1'