Stefano -> Stefanov
Merge branch 'davidcalhoun-patch-1'