Commit Version 0.02

Fixed Minor Defects