Issue_4

Closes #4