Merge pull request #1 from luebbert42/master

small improvements