Merge tag '3.0.4' into develop

tagging 3.0.4
update readme versions
Merge branch 'release/3.0.4'