Merging changes from dev to master to keep things in sync, as usual. #193

Closed senakafdo closed 6 years ago