Version 3 

New additions some clean up
Merge pull request #1425 from WKNiGHT-/patch-2

Version 3