Fix value objects
Merge pull request #2 from kassko/fix_value_objects

Fix value objects