03/24/2014: Sameer Adhikari - Updated files