resolve pull request #63 conflicts, merge it in
Merge branch 'jimktrains-stored_proc'