Some optimizations
Merge pull request #4 from bwall/develop

Some optimizations