Merge pull request #8 from Hube2/Dev

Refresh from Master