Updated for 0.4.1