Merged Changes from 1.9.9.5B

Updated to Version 2