Merge pull request #574 from adminempire/master

Merging in a couple fixes from archpwn.