added the general feature return 1
Merge branch 'master' into tbarker-newwork