Issue 63

Should be the last of the necessary changes to close #63