Update 2.0.4 (Fixes #18)