WIP branch
Corrections in gitignore
Merge branch 'wip'
Branch "master" specifics