Updated for version 0.3