final test and file cleanup
Merge pull request #2 from Hube2/Dev

final test and file cleanup