Merge pull request #3 from rudypenajr/revert_fix

added back reverted changes on 1st PR