enhancement #51

fixes enhancement #51