Updating to 2.0.4

Merging