updating files
Merge pull request #1 from hamlet82/master

updating files