fix #13
updates for #7