Refactoring for updated software version
Merge pull request #3 from dieterdemeyer/master

Refactoring for updated software version