Version 3.0.4.0 ready

Messed up the readme
Merge 3.0.4.0 to master