mod
mod
Merge pull request #1 from IT2-1-2014/master

base setting