Merge pull request #17 from jdhenke/marcel

Use Paxos