Updating Master
Merge pull request #1 from patrickg2014/master

Updating Master