Merge pull request #196 from andhieka/working

Small refactoring
Merge pull request #197 from andhieka/working

Travis Continuous Integration
update travis yml