Fixes issue #2
merge master