Merge pull request #18 from dmcclean/master

Inflation and scaling
style tweaks: let -> where, removed parens
exploring the addition of +/-