fix issue #24
fix issue #31
fix issue #32