Merge pull request #315 from dtrifiro/sync-with-0.7.2

Merge pull request #315 from dtrifiro/sync-with-0.7.2 #8