Issue/#6

fixes issue #6