updated for version 0.2