travis ci integration, #537
Merge remote-tracking branch 'origin/master'