Refactored and made more generic.
Merge branch 'master' of https://github.com/cfreih/COSC_350_Oglesby