Fixing Issue 1

Closes #1