Changes to version 0.9-pre (b870ce7 2013-12-17 09:01:58 -0800)