more updates
Merge pull request #3 from mhansbury/master

more updates