edif file
edit Makefile
Merge pull request #2 from ymizushi/refactor_131018

Refactor 131018