Updated a few things on the build system
Merge remote-tracking branch 'origin'