Dev

Pull request to merge master and dev branch