[FIX] Closes #16