minor changes, but I get a weird error. Just doing this so I can pull
Merge branch 'master' of https://github.com/elanas/Shuq