Fix #11
fix #10