main commit for stevebranch
Merge pull request #2 from jhash/mainSteveBranch

main commit for stevebranch