Merge pull request #336 from edgy360/master

Update Travis configuration
Fixes #337 (Compilation errors)