Merge pull request #38 from xbony2
Merge pull request #37 from Speiger
Merge pull request #36 from Speiger