Enhancement and bug fixing
Merge branch 'master' of https://github.com/oazabir/teamvy.git