@leolara @mumia 
I just committed the changes as Leo Suggested. I hope I didn't miss anything. Could you please review?