Closes #1 and closes #39
v2.2.1