Hard fix, close to death
Merge pull request #26 from cravacuore/develop

Hard fix, close to death
Merge pull request #27 from shuragrox/develop

Develop
InitialSetup almost finished