Issue3

Fixes #3