Release 2.0.2, fixes 12, fixes 15