closes #4
#2