QA
Merge pull request #2 from mhor/optimization

QA