Merge pull request #3 from paddatrapper/master

various small changes