More descriptive and Closes #23