Fixes and added new changes

Updated version from 1.0 to 2.0.3
With all latest updates