Created by: brucebolt
Slight change to the behaviour of my last pull request to fully comply with the spec