Deployed: Merge pull request #134 from jamesdabbs/master

generated from commit b5ff13162e43f772695e12ebd95da4ab29056be4