Almost working project
Merge pull request #30 from shuragrox/develop

Almost working project