Git merge cleanup part 3
GIt merge cleanup part4
Reparing realese 0.2
Merge branch 'v0.2.1'
Revert "Merge branch 'v0.2.1'"

This reverts commit d14557f0645947fd4fec44955ad2ba2dac7096c4, reversing
changes made to 1e787bedcbddac0df6e60d952bfb5c466b151c1b.