Updated for 0.3.1