More Optimizations!
Merge pull request #25 from cryptic-io/optimize

More Optimizations!