Small commit for issue #27, and part of a test