Addressing #238 and #239
DEV merge