Some changes and create 1.3 tag version