improved optimization
Merge branch 'master' of https://github.com/borist/cis400