fix(*): Closes #117