Issue/8

Closes #8