Fixes #203
Version 0.10.7