Close #53, #68 and #186