Final changes
Merge pull request #18 from TaviscaSolutions/master

Final changes