Considering #44 fixed

Need to do a once over on documentation to finish up, see issue #22