MADE FIXED OK?
Merge pull request #18 from swarley7/master

MADE FIXED OK?