Merge pull request #4 from kreczko/development

Fixing travis tests