Solving issue #8

close #