Issues #27 and #33