Final merged
Merge pull request #11 from TaviscaSolutions/final-version

Final merged