Merge pull request #4 from yannisgu/development

enhanced description
Merge branch 'development'
deployment from travis
no message