Closes #121
Closes #120