Fix #12 and update to 2.0.4