Hopefully Final Changes
Merge pull request #320 from Rudday/add-Rudday

Merging PR from @Rudday