Fix #4
Fix #21