Issue closes #4