Merge pull request #1 from xeno-by/master

fixes the travis build
Squashing again for PR
Merge pull request #2 from aghosn/master

First PR
Updates build owners