don't know what I did
Merge pull request #1 from Hube2/Dev

Pull from Dev
Merge pull request #2 from Hube2/Dev

final test and file cleanup
Merge pull request #3 from Hube2/master

Update from master