Update for clone
Merge remote-tracking branch 'upstream/master'
Merge pull request #149 from jerv13/master

Update for clone
Merge remote-tracking branch 'upstream/master' into sandbox