Develoopment merge into Master, getting ready for version 2.0 release.
Develoopment merge into Master, getting ready for version 2.0 release.