diff --git a/doc/helianthus-doc-ru.odt b/doc/helianthus-doc-ru.odt
index 8fb84b1..8eab36d 100644
Binary files a/doc/helianthus-doc-ru.odt and b/doc/helianthus-doc-ru.odt differ
diff --git a/win/build-program-win.sh b/win/build-program-win.sh
index 610222d..e933be5 100755
--- a/win/build-program-win.sh
+++ b/win/build-program-win.sh
@@ -28,8 +28,18 @@ source function.sh
 source toolchain.sh
 
 
-OPTIONS="-O3 -DNDEBUG"
-#OPTIONS="-g -O0"
+if [ -z "OPTIONS" ]; then
+	OPTIONS="-O3 -DNDEBUG"
+	#OPTIONS="-g -O0"
+fi
+
+COMP="CC"
+COMP_OPTIONS=
+if [ "$COMPILER" = "c++" ]; then
+	COMP="CXX"
+	COMP_OPTIONS="-static-libstdc++"
+fi
+
 
 packages=""
 newpackages="program"
@@ -38,24 +48,25 @@ newpackages="program"
 
 
 function build_program() {
+	local CMP=${!COMP}
 	if [ -z "$LINUX" ]; then
-		echocall $CC \
+		echocall $CMP \
 			"${ARGS[@]}" \
 			-Wall $OPTIONS \
 			-I"$ROOT/release/include/helianthus" \
 			"$ROOT/release/lib-$bits/libhelianthus.a" \
 			-lmingw32 -mconsole \
-			-lm -static-libgcc \
+			-lm -static-libgcc $COMP_OPTIONS \
 			-lopengl32 -ldinput8 -ldxguid -ldxerr8 -luser32 -lgdi32 -lshlwapi \
 			-lwinmm -limm32 -lole32 -loleaut32 -lshell32 -lsetupapi -lversion -luuid \
 			-o "$TARGETPATH/$PROGNAME-$bits.exe"
 	else
-		echocall $CC \
+		echocall $CMP \
 			"${ARGS[@]}" \
 			-Wall $OPTIONS \
 			-I"$ROOT/release/include/helianthus" \
 			"$ROOT/release/lib-$bits/libhelianthus.a" \
-			-lm -static-libgcc -lGL -ldl -pthread \
+			-lm -static-libgcc $COMP_OPTIONS -lGL -ldl -pthread \
 			-o "$TARGETPATH/$PROGNAME-$bits"
 	fi
 }