Issue4

Closes #4 and closes #5.