updates
fixed conflicts
Merge pull request #2 from Minasokoni/picnic_branch

updates