Merge #14 in 2.1.4