diff --git a/lib/Modeler.js b/lib/Modeler.js
index 476b0258..d1ca8b17 100644
--- a/lib/Modeler.js
+++ b/lib/Modeler.js
@@ -6,6 +6,8 @@ var Ids = require('ids');
 
 var Viewer = require('./Viewer');
 
+var NavigatedViewer = require('./NavigatedViewer');
+
 var initialDiagram =
   '<?xml version="1.0" encoding="UTF-8"?>' +
   '<bpmn:definitions xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ' +
@@ -118,6 +120,10 @@ inherits(Modeler, Viewer);
 
 module.exports = Modeler;
 
+module.exports.Viewer = Viewer;
+
+module.exports.NavigatedViewer = NavigatedViewer;
+
 /**
  * Create a new diagram to start modeling.
  *
diff --git a/test/spec/ModelerSpec.js b/test/spec/ModelerSpec.js
index 61b0cae2..e83d0f4d 100644
--- a/test/spec/ModelerSpec.js
+++ b/test/spec/ModelerSpec.js
@@ -399,4 +399,16 @@ describe('Modeler', function() {
 
   });
 
+
+  it('should expose Viewer and NavigatedViewer', function() {
+
+    // given
+    var Viewer = require('../../lib/Viewer');
+    var NavigatedViewer = require('../../lib/NavigatedViewer');
+
+    // then
+    expect(Modeler.Viewer).to.equal(Viewer);
+    expect(Modeler.NavigatedViewer).to.equal(NavigatedViewer);
+  });
+
 });