2013-12-11 - Jonathan Morgan - bug fixes.