Changes to version 0.10-pre (af93684 2014-03-17 11:57:08)