Fix #10
Fix #11