Merge pull request #21 from gabriele-v/master

Comment code to fix bug #383