Fixes #118. Fixes #120. Closes #121. Closes #117.

Stable Version 3.1.0.