Merge pull request #45 from pmrowla/master

setup empty plugin
Merge pull request #46 from pmrowla/master

fix travis
Merge remote-tracking branch 'upstream/master'