Implemented request from issue #3.