InitialSetup almost finished
Merge pull request #29 from shuragrox/develop

InitialSetup almost finished