Bug Fix
Merge pull request #2 from Leithian/master

Bug Fix