merged develop to master #85

Closed clarkwmcd closed 6 years ago