Merge pull request #12 from Hube2/Dev

Update from Dev
Merge pull request #13 from Hube2/master

Refresh from Master