fixes #1 fixes #13