2.0.8

#97, #98, #99, #104, ..