Changes for version 0.1.2_r17691