150427

Merged Wataru Takase requested to merge 150427 into master

Refactored codes

Merge request reports