Interim commit

Issue #203