fixed an infinite loop bug
Merge branch 'master' of github_ME:bovard/rgb