fixed some setup things
fixed some setup things
Merge pull request #77 from TRex22/develop

Develop