Merge pull request #1 from jwolff52/master

Updating to match master
Merge pull request #2 from jwolff52/compiled

Merge pull request #1 from jwolff52/master