closes #5

fix #6

fixed #7