q-r
Merge pull request #11 from Unknwon/master

q-r