Small error fix, further performance improvements
Merge pull request #16 from sirnfs/mikester

Small error fix, further performance improvements