Merge recent changes in from develop #251

Closed sy238-unikent closed 6 years ago