Merged #2

Merging fix in pull request #2