Added feature: http://jira.diamond.ac.uk/browse/SCI-1140