Merge pull request #3 from Foggalong/master

Minor tweaks
Merge pull request #1 from nixers-projects/master

Pull in upstream