fix(*): Closes #111