changed the way names are added
Merge branch 'master' of https://github.com/wordium/i290P4