more changes for version 0.010