Rolled version to 0.3.4