add pwfcck
Merge remote-tracking branch 'origin/1.3.0.pre' into 1.3.0.pre

Conflicts:
	main.cpp