Corey's superpowers unleashed
Merge pull request #86 from wolves-2014/implement-coreys-code-review

Corey's superpowers unleashed