Master Commit

added some minor changes