Merge pull request #11 from jeffChavez/parker

Parker
Merge branch 'master' into parker
Cancel objects fix