Merge pull request #12 from ralphtheninja/master

misc fixes