Merge pull request #1 from Hube2/Dev

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

Refresh from Master