pre-merge commit
Merge branch 'master' of github.com:xiamike/git-scan
added header for text match response, fixed misc issues