Merge pull request #1 from cavarzan/master

'1.2.0'