Closes #3 jkj