Fixed Location
Merge branch 'master' of github_ME:bovard/rgb
Updated to use location instead of xy