Merge pull request #3 from ralphtheninja/master

minor fixes