merged with john's pull
Merge branch 'master' of https://github.com/paranoidmarv/WhiteSharks