Merge branch 'master', remote-tracking branch 'source/master'
Merge remote-tracking branch 'source/master'
Merge remote-tracking branch 'source/master'
Fixed build.
Merge pull request #45 from xavierr/master

Fixed build