++
fix #46
fix #43