Fixes issue 16

Fixes #16
:+1: