Incorporate the changes in the develop #14