2013-05-13 - Jonathan Morgan - bug fixes.