diff --git a/HISTORY.md b/HISTORY.md
index 05946486..4256caf7 100644
--- a/HISTORY.md
+++ b/HISTORY.md
@@ -1,10 +1,12 @@
 # vis.js history
 http://visjs.org
 
+
 ## not yet released, version 1.0.2
 
 ### Timeline
 
+- Implemented option `minHeight`, similar to option `maxHeight`.
 - Some tweaks in snapping dragged items to nice dates.
 - Made the instance of moment.js packaged with vis.js accessibly via `vis.moment`.
 - Fixed a bug in replacing the DataSet of groups via `Timeline.setGroups(groups)`.
@@ -14,6 +16,7 @@ http://visjs.org
 - added zoomable and moveable options.
 - changes setOptions to avoid resetting view.
 
+
 ## 2014-05-09, version 1.0.1
 
 ### Timeline
diff --git a/docs/timeline.html b/docs/timeline.html
index 7142712e..20df8818 100644
--- a/docs/timeline.html
+++ b/docs/timeline.html
@@ -402,7 +402,7 @@ var options = {
 
 <tr>
   <td>height</td>
-  <td>String</td>
+  <td>Number | String</td>
   <td>none</td>
   <td>The height of the timeline in pixels or as a percentage.
     When height is undefined or null, the height of the timeline is automatically
@@ -438,10 +438,9 @@ var options = {
 
 <tr>
   <td>maxHeight</td>
-  <td>Number</td>
+  <td>Number | String</td>
   <td>none</td>
-  <td>Specifies a maximum height for the Timeline in pixels.
-  </td>
+  <td>Specifies the maximum height for the Timeline. Can be a number in pixels or a string like "300px".</td>
 </tr>
 
 <tr>
@@ -453,6 +452,13 @@ var options = {
   </td>
 </tr>
 
+<tr>
+    <td>minHeight</td>
+    <td>Number | String</td>
+    <td>none</td>
+    <td>Specifies the minimum height for the Timeline. Can be a number in pixels or a string like "300px".</td>
+</tr>
+
 <tr>
   <td>onAdd</td>
   <td>Function</td>
diff --git a/src/timeline/component/RootPanel.js b/src/timeline/component/RootPanel.js
index 3cf1915a..0386461d 100644
--- a/src/timeline/component/RootPanel.js
+++ b/src/timeline/component/RootPanel.js
@@ -101,6 +101,7 @@ RootPanel.prototype.repaint = function repaint() {
 
   // update frame size
   this.frame.style.maxHeight = util.option.asSize(this.options.maxHeight, '');
+  this.frame.style.minHeight = util.option.asSize(this.options.minHeight, '');
   this._updateSize();
 
   // if the root panel or any of its childs is resized, repaint again,