commit merge, 0.3.1 release and misc.