Updated for version 0.0.2