Adding first basic test
Fixed flake8 issue
Merge remote-tracking branch 'upstream/master'
Merge pull request #150 from tfhartmann/master

Updating Travis test