Revert "Revert "Merging changes from origin""
Merge pull request #3 from Babicaa/revert-2-revert-1-master

Revert "Revert "Merging changes from origin""