Closes the following issues: 100, 115, 117, 119, 121, 122, 128, 129, 130