Merge pull request #19 from suzukaze/refactor

Refactor argument macro
Replace magic numbers with constants