Fix #18
Merge