Address issue #138.
Merge pull request #139 from simongog/wextra

Address issue #138.