functional edits
Merge pull request #15 from 4justinstewart/function_edits

functional edits