Merge pull request #2 from xdegaye/master

Build at revision 196543.