Updating master with latest release #4

Closed jeffmoran closed 7 years ago