final changes for version 0.10.0