Merge branch 'develop'
update version
Updated docs and prepare for release v.0.0.3-beta
resolved merge conflicts
Merge branch 'master' into develop