Merge pull request #2 from ralphtheninja/master

minor fixes