Closing #66, #67 and #69