Merge pull request #5 from Hube2/Dev

Pull from Dev
Merge pull request #6 from Hube2/master

Merge pull request #5 from Hube2/Dev