Fixes #52, Incorporates #53

Pretty easy.