merge develop into master #285

Closed kevincolten closed 6 years ago