Re close of #392

Re closed Feature #392