Branch Merge

Hi Adam

I was facing trouble to add code in master branch under sub module  so I forked master branch. And added all required code, queries and ugly & dirty read me :) to my branch. Now  I am creating this pull request so that you can just merge in master if everything alright.