modified post argument and add filter
Merge branch 'master' into scottDev
Merge branch 'scottDev'