Fix bug #401 and bump version and changelog