Merge pull request #1 from goliatone/travis

Travis
Merge branch 'master' into travis