issue #36 rijesen- 244be3e2fcd7f8fdc356129135705a5a0f9e4c09