Issues #62, #136, #137, #138, #139