Merge pull request #8 from haraldpdl/optimizations

Optimizations