Updated for version 0.4