Merge pull request #1 from Hube2/Dev

Refresh from Master