Annoying setup stuff
Merge pull request #1 from nik9000/master

Annoying setup stuff