Better setup
Merge pull request #30 from Anahkiasen/patch-1

Better setup