Bump version to 0.3.0
hotfix, bump to 0.3.1
Merge branch 'master' of github.com:adelevie/ecfs
fix merge conflict