Merge pull request #5 from samposa/nemo594

2nd attempt to fix Nemo#594