Merge branch 'chihsuan'
Merge branch 'chihsuan'
Merge branch 'chihsuan'
Merge branch 'chihsuan'
update gemfile