random fixes
Merge pull request #8 from Jordach/master

Random fixes