corrected commit with Jacob.
Merge pull request #43 from JSpreadborough/Justin

Refreshed fork