Manual merge, Closing #269, #118, Closing #10, Closing #127, #154