yupe/yupe — pull request #600 by mikspark (2013-02-05 22:50:14+00:00)
Title: Fix 1, 3 in #597

#597