Issue #163 

started...