Commiting all changes on Apr 27 to master