corrections 2 issue #3
Merge pull request #7 from Martichoras/Q4

Q4
Merge pull request #8 from Martichoras/master

merge master into Q4