Updated grid optimization (for CC)
Merge branch 'master' of github.com:leeping/forcebalance