Merge pull request #3 from Hube2/Dev

Pull from Dev