closes #6
merge