Develop

I've merged both pull requests into one single pull request