Version 2.0.4 released

Minor improvements