주석 제
Merge remote-tracking branch 'origin/master' into module-test

Conflicts:
	cripper.py