Merge pull request #1 from fercik/development

Version 1.0.0
Merge pull request #2 from fercik/master

Modified travis file