Comment System integrated. Fix #46