Build #29:   Merge pull request #2 from Adnan0703/develop clean up and enhancement on branch 2.0 almost 9 years ago