Fix merge conflict in experimental branch

Sorry about #22.
Correct branch this time.