Merged #141 to be included in 2.1.3