small refactor
Merge pull request #69 from y-yagi/refactor_20141123

small refactor