Merge pull request #381 from sergeyklay/master

Minor fixes
New feature: Added initial Travis CI setup