Fixed build errors - does GIT have CI builds or what?
Merge pull request #55 from jpeterson7755/master

Fixed build errors - does GIT have CI builds or what?
Merge pull request #19 from Magenic/master

Merge from master