merge
fix #56