#7

Closes #7