Not really a fix for #1
Merge conflict fixed