Merge pull request #317 from wshafer/master

Minor Performance Optimizations