Rolled version to 0.4