Merge branch 'master' of https://github.com/AshwinBalachandar/ADF.git