Merge pull request #3 from Hube2/Dev

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

Refresh from Master