Merge pull request #14 from Hube2/Dev

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

Merge pull request #14 from Hube2/Dev