Merging version 0.9.0.0