merge #27
preparing 2.0.12