Merge pull request #17 from ralphtheninja/master

misc fixes