diff --git a/dist/react-menu.js b/dist/react-menu.js
index b38e85e..70f7d77 100644
--- a/dist/react-menu.js
+++ b/dist/react-menu.js
@@ -106,7 +106,7 @@ var Menu = module.exports = React.createClass({
     var trigger;
     if(this.verifyTwoChildren()) {
       React.Children.forEach(this.props.children, function(child){
-        if (child.type === MenuTrigger.type) {
+        if (child === MenuTrigger) {
           trigger = cloneWithProps(child, {
             ref: 'trigger',
             onToggleActive: this.handleTriggerToggle
@@ -121,7 +121,7 @@ var Menu = module.exports = React.createClass({
     var options;
     if(this.verifyTwoChildren()) {
       React.Children.forEach(this.props.children, function(child){
-        if (child.type === MenuOptions.type) {
+        if (child === MenuOptions) {
           options = cloneWithProps(child, {
             ref: 'options',
             horizontalPlacement: this.state.horizontalPlacement,
@@ -1340,4 +1340,4 @@ module.exports = warning;
 
 },{"./emptyFunction":16}]},{},[7])
 (7)
-});
\ No newline at end of file
+});
diff --git a/lib/components/Menu.js b/lib/components/Menu.js
index ee29c59..6f0d7aa 100644
--- a/lib/components/Menu.js
+++ b/lib/components/Menu.js
@@ -2,7 +2,7 @@
 
 var React = require('react');
 
-var cloneWithProps = require('react/lib/cloneWithProps');
+var cloneWithProps = React.addons.cloneWithProps;
 var MenuTrigger = require('./MenuTrigger');
 var MenuOptions = require('./MenuOptions');
 var MenuOption = require('./MenuOption');
@@ -105,7 +105,7 @@ var Menu = module.exports = React.createClass({
     var trigger;
     if(this.verifyTwoChildren()) {
       React.Children.forEach(this.props.children, function(child){
-        if (child.type === MenuTrigger.type) {
+        if (child === MenuTrigger) {
           trigger = cloneWithProps(child, {
             ref: 'trigger',
             onToggleActive: this.handleTriggerToggle
@@ -120,7 +120,7 @@ var Menu = module.exports = React.createClass({
     var options;
     if(this.verifyTwoChildren()) {
       React.Children.forEach(this.props.children, function(child){
-        if (child.type === MenuOptions.type) {
+        if (child === MenuOptions) {
           options = cloneWithProps(child, {
             ref: 'options',
             horizontalPlacement: this.state.horizontalPlacement,
diff --git a/lib/components/MenuOptions.js b/lib/components/MenuOptions.js
index e440b56..4e536a2 100644
--- a/lib/components/MenuOptions.js
+++ b/lib/components/MenuOptions.js
@@ -1,8 +1,8 @@
 /** @jsx React.DOM */
 
 var React = require('react');
+var cloneWithProps = React.addons.cloneWithProps;
 var MenuOption = require('./MenuOption');
-var cloneWithProps = require('react/lib/cloneWithProps')
 var buildClassName = require('../mixins/buildClassName');
 
 var MenuOptions = module.exports = React.createClass({
diff --git a/lib/helpers/injectCSS.js b/lib/helpers/injectCSS.js
index 9a50be2..7a7947e 100644
--- a/lib/helpers/injectCSS.js
+++ b/lib/helpers/injectCSS.js
@@ -18,10 +18,10 @@ module.exports = function() {
       cursor: 'pointer'
     },
     '.Menu__MenuOption--disabled': {
-      'background-color': '#eee',
+      'background-color': '#eee'
     },
     '.Menu__MenuOption--active': {
-      'background-color': '#0aafff',
+      'background-color': '#0aafff'
     },
     '.Menu__MenuOption--active.Menu__MenuOption--disabled': {
       'background-color': '#ccc'
diff --git a/lib/mixins/buildClassName.js b/lib/mixins/buildClassName.js
index f117033..1067ff5 100644
--- a/lib/mixins/buildClassName.js
+++ b/lib/mixins/buildClassName.js
@@ -6,5 +6,5 @@ module.exports = {
       name += ' ' + this.props.className;
     }
     return name;
-  },
+  }
 };