Work on Issue #16 and #170