war&peace
Merge pull request #3 from trinberg/branch1

war&peace