Bunch of random stuff
Merge pull request #5 from itsZN/master

randomstuff