Merge branch 'develop'
minor
Merge branch 'develop'
travis
testing travis
travis fixed
travis fixed
travis and coverall with correct coverage
Merge branch 'master' into develop
coverage increased