polished #5
fix #31