Merge pull request #5 from Hube2/Dev

Refresh from Master