Merge from JohnMHarrisJr
Merge Libs
Merge pull request #4 from DigiTechs/master

This looks correct...