Finishing work on Issue #122 and #83