Implemented  issue #17.