Issue/#6

fixes #6