typo in gitignore
merge 'wip' work into 'master'