fixed bug
Merge remote-tracking branch 'origin/master'

Conflicts:
	Matlab-script/resize_figure.m