Merge pull request #1 from justarandomname/master

updated