Clean up files add shim
Clean up files add shim
Merge remote-tracking branch 'upstream/master'
Clean up files add shim
Merge remote-tracking branch 'upstream/master'
Merge pull request #101 from jerv13/master

Clean up files add shim