03/25/2014: Sameer Adhikari - Updated files