Fixed comment bug and added ownership functionality
Merge branch 'master' of https://github.com/Aldizh/CiaoInternalSupport