Merging version 0.1.1