added files for merge
Merge pull request #17 from Dfedor/master

added files for merge