Initial Solution
Merge pull request #2 from florin-onac/develop

Initial Solution - ok