Jamiebull

Merging latest pull into my fork including fix for issue 32