Fixes #124. Fixes #127.

Stable Version 3.1.1.