merge smarius pull request