Issue5

fixes #5