Adding a line to desktop
pulling in changes from master