Feature/20141028 kaneko