Issue3

Fixes issue 3