Merge pull request #7 from Kimundi/master

Removed mutable fields.