Commiting some changes from yesterday
Marging from HEAD