Merge pull request #7 from masa0226/masueda_141213

removed
Merge branch 'master' into develop_ysk