Merge pull request #15 from DeX3/qa

Qa