I created Pull Request #429 with these fixes.