Address issue #30 and #31