This closes Github issue #1