Merge pull request #21 from valorkin/master

Travis CI build 141 failture fix