Fixes issue 15
Update issue 15