Merge branch 'rfm/nicer_method'
Karen Etheridge [Sun, 10 Feb 2013 00:22:18 +0000 (16:22 -0800)]

Trivial merge