Fixes issue #9
fixed conflicts