Fixes #59. Fixes #2. Closes #55.