ucla/mwf — pull request #144 by loganfranken (2012-05-14 00:58:30+00:00)
Title: Maint 1.2

Fix for Issue #143