Release 2.0.4, couple of bug fixes (see #41, #48)