fixes #4

Modifications