Updating master with develop branch (1.6.0)