#17
closes #19
#7