This push closes issue #27
This closes issue #28