updating master with new ver1.0a