Merge pull request #1 from DienstKoning/master

improvements by mrdemc from dienstkoning