[FIX] Closes #33