Merge pull request #17 from takezoe/mark-override

Mark override methods