Merge pull request #22 from takezoe/mark-override

Mark override methods