fixed #18
implemented feature request #17