Fixed some stale code commits.
More fixes
Merge pull request #2 from christophercantu/pull_request_feature

Automatically Merged