fixes #1, fixes #2; update version