Merge tag '0.3.0' into develop

0.3.0
Merge branch 'master' into develop
commit to verify travis build