merged changes from cocker-spanielv2 (Chezy Champs working code)
20140908 Code Review w/ Wesley and Nicolas