version 0.9
merging version 0.9