Improved statement generation logic
Merge branch 'master' of github.com:michaelrshannon/manifesto