Merged the code from the development to the master branch