travis support
Merge pull request #81 from dereuromark/develop

travis support