Merge pull request #1 from DienstKoning/master

improvements by mrdemc from dienstkoning
Merge pull request #10 from mrdemc/master

Merge pull request #1 from DienstKoning/master