updated for version 0.0.7