Merge remote-tracking branch 'origin/pr/18'
Setting version to 0.3.1
Rename resolvers
Update README with latest version number
Add notes for 0.3.1
Convert tab to spaces