simplification and some optimization
Merge branch 'master' of github.com:christopherperry/slingbladerunner