Readme fixes
Bumping verion to 0.4
Merge conflict