Merge pull request #312 from elyezer/master

Add Travis configuration
Add some PEP8 charming
Merge pull request #313 from omaciel/improve-pep8

Add some PEP8 charming