additional changes
Merge pull request #1 from javascriptpotato/master

additional changes