issues #54 & #72 moar docs