Merge pull request #19 from LPGhatguy/master

Fixes to Compile
Merge pull request #1 from Biotronic/master

Merge pull request #19 from LPGhatguy/master