King, Fixes #49
Merge pull request #563 from evonfriedland/master

King, Fixes #49