Add double-dot handling.  Fixes #1