Update from Joe, also resolves #13