Merge pull request #1 from rmassingill/master

Pull Request
compile code
compile code