Final changes done
Merge branch 'master' of https://github.com/TaviscaSolutions/green-repo