fix(*): Closes #130