merged master to develop branch

let's continue the features on the develop branch