more changes
Merge pull request #2 from janjust/new_file

more changes