[ADD] Closes #13