[FIX] Closes #15