[ADD] Closes #28