Work on optimization
Merge branch 'master' of https://github.com/cliburn/sta-633