Minor code performance improvements
Merge pull request #15 from adisib/dev

Minor code performance improvements