diff --git a/README.md b/README.md
index accb086..27b2418 100644
--- a/README.md
+++ b/README.md
@@ -163,7 +163,7 @@ import {CSVDownload} from 'react-csv';
 For non-node developers, they have to use CDN version :
 
 ```html
- <script src="https://cdn.rawgit.com/abdennour/react-csv/7918cadc/cdn/react-csv-latest.js" type="text/javascript"></script>
+ <script src="https://cdn.rawgit.com/abdennour/react-csv/6424b500/cdn/react-csv-latest.min.js" type="text/javascript"></script>
 
  <script type="text/babel">
    const {CSVDownload, CSVLink} = ReactCSV;// or window.ReactCSV
diff --git a/sample-site/src/app.jsx b/sample-site/src/app.jsx
index 7f4a28a..03c9eeb 100644
--- a/sample-site/src/app.jsx
+++ b/sample-site/src/app.jsx
@@ -13,7 +13,7 @@ class App extends React.Component {
   render() {
     return (
       <div style={{padding: 10}}>
-        <h1>react-csv</h1>
+        <h3><code>react-csv/sample-site/src/app.jsx</code></h3>
         <hr />
         <div>
 
diff --git a/src/components/Download.js b/src/components/Download.js
index 2a1c745..3d3d33d 100644
--- a/src/components/Download.js
+++ b/src/components/Download.js
@@ -1,11 +1,20 @@
 import React from 'react';
 import {buildURI} from '../core';
-import {defaultProps as CommonDefaultProps, PropTypes} from '../metaProps';
-
+import {
+   defaultProps as commonDefaultProps,
+   propTypes as commonPropTypes} from '../metaProps';
 const defaultProps = {
   target: '_blank'
 };
 class CSVDownload extends React.Component {
+
+  static defaultProps = Object.assign(
+    commonDefaultProps,
+    defaultProps
+  );
+
+  static propTypes = commonPropTypes;
+
   constructor(props) {
     super(props);
     this.state={};
@@ -31,10 +40,4 @@ class CSVDownload extends React.Component {
   }
 }
 
-CSVDownload.defaultProps = Object.assign(
-  CommonDefaultProps,
-  defaultProps
-);
-CSVDownload.PropTypes = PropTypes;
-
 export default CSVDownload;
diff --git a/src/components/Link.js b/src/components/Link.js
index 0126d80..b75e51c 100644
--- a/src/components/Link.js
+++ b/src/components/Link.js
@@ -1,8 +1,14 @@
 import React from 'react';
 import {buildURI} from '../core';
-import {defaultProps, PropTypes} from '../metaProps';
+import {
+   defaultProps as commonDefaultProps,
+   propTypes as commonPropTypes} from '../metaProps';
 
 class CSVLink extends React.Component {
+
+  static defaultProps = commonDefaultProps;
+  static propTypes = commonPropTypes;
+
   constructor(props) {
     super(props);
     this.buildURI= this.buildURI.bind(this);
@@ -22,7 +28,5 @@ class CSVLink extends React.Component {
     )
   }
 }
-CSVLink.defaultProps = defaultProps;
-CSVLink.PropTypes = PropTypes;
 
 export default CSVLink;
diff --git a/src/metaProps.js b/src/metaProps.js
index ed4fe7c..041f047 100644
--- a/src/metaProps.js
+++ b/src/metaProps.js
@@ -1,7 +1,7 @@
 import React from 'react';
 
 
-export const PropTypes = {
+export const propTypes = {
   data: React.PropTypes.oneOfType([
     React.PropTypes.string,
     React.PropTypes.array
diff --git a/test/ComponentsSpec.js b/test/ComponentsSpec.js
index bf5e57b..0dee29f 100644
--- a/test/ComponentsSpec.js
+++ b/test/ComponentsSpec.js
@@ -34,10 +34,16 @@ describe('CSVLink', () => {
      ]
     };
    });
+
    it(`renders without error if required props are passed`, () => {
      const wrapper = shallow( <CSVLink {...minProps} > Click here </CSVLink>);
       expect(wrapper.length).toEqual(1);
-     });
+   });
+
+   it(`has comma as default separator `, () => {
+     const wrapper = mount( <CSVLink {...minProps} > Click here </CSVLink>);
+     expect(wrapper.props().separator).toEqual(',');
+   })
 
     it(`renders anchor tag`, () => {
       const wrapper = shallow( <CSVLink {...minProps} > Click here </CSVLink>);