Updated to latest upstream version.
Merge pull request #1 from ianneub/master

Updated to latest upstream version 2.4.2