JohnMai/WhiteSharks — pull request #383 by Kiroshima (2014-05-29 22:32:47+00:00)
Title: Multiple Fixes from Issues

Fixes #349
Fixes #352