jasonasher Merge pull request #17 from codefordc/feature_engineering