Code was improved for support feature request #6
Merge pull request #33 from VanDerSam/master

Code was improved for support feature request #6