Adding tests to travis.
Merge remote-tracking branch 'upstream/dev-master' into dev-master
Merge pull request #51 from rhyolight/dev-master

Adding current tests to travis CI build