fix #6
working on #7