added integration tests, travis will complain
Merge remote-tracking branch 'origin/master'