Merging version 0.3