s121038
Merge branch 'master' of https://github.com/fyoshida/FySe2014.git