Get Travis running & refactor
Merge pull request #1 from mb-dev/support_testing

get travis running & refactor code