fix issue #10
fix issue #11
fix issue #10
fix issue #11