Updating submodules to use the URL
Merge remote-tracking branch 'remotes/upstream/master'
Merge pull request #40 from michaelhidalgo/master

Fixing Issue # 36