Merge pull request #10 from Hube2/master

Merge pull request #9 from Hube2/Dev
Merge pull request #11 from Hube2/Dev

Pull from Dev