Consolidating develop and master branches