Merge pull request #227 from lesceuni/Test

Serializable