Merge pull request #1 from cavarzan/master

'1.2.0'
Merge pull request #2 from cavarzan/ng1.2wip

Merge pull request #1 from cavarzan/master