Update readme
Updated changelog
Merge branch 'master' of github.com:funkybob/formulation