Merge pull request #8 from Martichoras/master

merge master into Q4
fixed sorces
Merge pull request #9 from Martichoras/Q4

Q4 into master