working on #9
fix #13