Merge change, fixes #1

...