Fixes serialisation problem related to #327 and #279.
Adds flag for #283.
Merge pull request #329 from LearningLocker/issue-283

Adds flag for #283.