merging with release 0.1