Merge pull request #16 from takezoe/mark-override

Mark override methods