Closes #245 Closes #251