Updates and normalisation
Merge pull request #203 from GrahamCampbell/updates

Updates and normalisation