more update
Merge pull request #4 from dhigginbotham/dave

merging from dhigginbotham branch