Fix things.
Merge pull request #1 from SoftlySplinter/master

Fix things.