JohnMai/WhiteSharks — pull request #510 by jcotrel (2014-06-07 23:03:49+00:00)
Title: ch2 bug fixes

#485 and #487