20140927: Minor Changes made