Merge pull request #1 from krzysztof-gzocha/devel

Sync master with devel
Merge pull request #2 from krzysztof-gzocha/devel

Small fixes + Travis config
Merge pull request #3 from krzysztof-gzocha/devel

Small tweaks
Merge pull request #5 from krzysztof-gzocha/devel

Sync devel to master
Fixing sending code coverage from Travis to Codeclimate