Issues #30 and #56