Small bug fixes, redundant code removal and updated functions  to new style
Merge branch 'master' of https://github.com/edgleyUK/serenity

Conflicts:
	README.md

Merge