diff --git a/Documentation/User Manual/1-user-interface/F_VEH-Editor.md b/Documentation/User Manual/1-user-interface/F_VEH-Editor.md
index a96ada06d07701a01db389538b54782eac5f120b..64dee8be15a82434c850f512856a15a38fc052e9 100644
--- a/Documentation/User Manual/1-user-interface/F_VEH-Editor.md	
+++ b/Documentation/User Manual/1-user-interface/F_VEH-Editor.md	
@@ -147,6 +147,7 @@ The *Efficiency EM to Drivetrain* can be used to consider the efficiency of a tr
 
 For the electric energy storage multiple battery packs can be configured and the initial state of charge can be defined.
 
+The maximum power of a hybrid drivetrain can be limited to a certain power. This limit has to be at least the maximum power of the combustion engine.
 
 ###Torque Limits
 
diff --git a/Documentation/User Manual/3-simulation-models/Electric_Motor.md b/Documentation/User Manual/3-simulation-models/Electric_Motor.md
index e51192c6bd30fa2978702b8547cc9084961a6c21..f25125590156013cad510748e0f7d06658202369 100644
--- a/Documentation/User Manual/3-simulation-models/Electric_Motor.md	
+++ b/Documentation/User Manual/3-simulation-models/Electric_Motor.md	
@@ -1 +1,11 @@
 ##Electric Motor
+
+The electric motor is modeled by basically 4 map files:
+ - Maximum drive torque over motor speed
+ - Maximum generation torque over motor speed
+ - Drag curve (i.e., the motor is not energized) over motor speed
+ - Electric power map
+
+The first two curves are read from a single .vemp file (see [Electric Motor Max Torque File (.vemp)](#electric-motor-max-torque-file-.vemp)). The drag curve is provided in a .vemd file (see [Electric Motor Drag Curve File (.vemd)](#electric-motor-drag-curve-file-.vemd)) and the electric power map in a .vemo file (see [Electric Motor Map (.vemo)](#electric-motor-map-.vemo)).
+
+The convention for all input files is that positive torque values drive the vehicle while negative torque values apply additional drag and generate electric power.
diff --git a/Documentation/User Manual/pics/VECTO_VehicleEditor_ParHyb_El.png b/Documentation/User Manual/pics/VECTO_VehicleEditor_ParHyb_El.png
index a75ac8a7b30f51e506c77fa79f903dbb4e2f4a53..fcf5657822cb66650e402e7288d7b605acda0df6 100644
Binary files a/Documentation/User Manual/pics/VECTO_VehicleEditor_ParHyb_El.png and b/Documentation/User Manual/pics/VECTO_VehicleEditor_ParHyb_El.png differ