Merge pull request #7 from Hube2/Dev

Pull from Dev