Merge pull request #2 from xopherdeep/master

Merge pull request #8 from XenGenie/master
Merge pull request #9 from XenGenie/master

Merge pull request #2 from xopherdeep/master
Merge pull request #10 from xopherdeep/Merge

Merge
Merge pull request #11 from xopherdeep/foobar

Foobar
Merge pull request #13 from xopherdeep/master

foobar