Merged develop to master.  This will become release 2.0.0
Merged develop to master.  This will become release 2.0.0