fix of issue #3

Merging fix of issue #3 into master branch