Merge pull request #51 from jeffu231/master

Merge from jeffu231/master
Merge remote-tracking branch 'remotes/giz/master' into mergeall2