issue 32
merge