Fix #110
Fixing merge