Some changes in functionality branch
Setup the merge to master