travis integration, version bump
pep8 style fix
Merge pull request #4 from nikicat/master

travis integration, version bump