Trying to address issue #135 Please, test and tell what you think.