Merging stuff
Merge branch 'master' of https://github.com/elanas/Shuq