Closes #354
Merge commit 'aae9efa90de815b950521e3efc62f8bc366f9fe4' into HEAD