fix make lint
add gitignore
Merge branch 'master' into develop
Update changelog with last feature