Merge patch from JohnHay to fix dots

Fixes #1