Fix #23
Merge with upstream