Develop

Merge branch 'master' into develop. @fuzetsu please, use the develop branch to commit your changes.