Merge pull request #4 from wtsi-hgi/master

Fixes handling of NotAcceptable exceptions
Improves readability and style as per dougblack's comments