Merge Teamwork -> V1.0

Try lang magcomment sa Pull request