Fixes #80. Stable Version 2.2.0