Version 2.0.4, fixes #8