closes #13, fixes #14