Merge pull request #146 from gabriele-v/master

Update for 1.1.0 final