Merge pull request #8 from Hube2/Dev

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

Merge pull request #8 from Hube2/Dev