[ADD] Closes #12