Bump to version 2.0.4 with some minor changes