Merge pull request #1 from amommy/branch1

Branch1
stackdump again