Commit Q2
Merge pull request #6 from Martichoras/Q2

Commit Q2