Fix suspended logic
Merge branch 'develop' of https://github.com/unikent/of-course into feature/application-styling-569