Merge pull request #24 from EmilSayahi/master

Nightly Travis
Merge pull request #25 from EmilSayahi/master

Sync Branches
Merge pull request #26 from EmilSayahi/nightly

Nightly