Merge pull request #3 from DLavin23/master

Bug Fix
last weeks refactoring