Namerefactoring
Merge pull request #8 from JanHorak/NameRefactoring

Namerefactoring