Closes #23 ...