2.1.2

#90 and #88