HaibingShao/ogs — pull request #26 by HaibingShao (2013-06-24 14:27:47+00:00)
Title: Haibing working

taking in changes from the main branch.