Merge pull request #2 from kilip/master

basic test setup
Merge pull request #3 from kilip/master

setup test environment
fixed travis build