optimizations
Merge pull request #1 from Beeblerox/master

optimizations