bump version to 2.0.4
Merge branch 'maint'