Resolves Issue 5

Should resolve Issue 5.