This fixes issue #2 and improves code quality.