Merge @rogerthat pull request - closes #13