Merge branch 'release/0.1'
second release w1
minor text correction
resolved merge conflicts
the second story of this release