Merge pull request #1 from nwiechmann/master

Update Changes